From: RobLa <robla@wikimedia.org>
Date: Thu, 1 Nov 2012 04:58:19 +0000 (+0000)
Subject: Revert "(Bug 41436) Tone down sanity check, just warn, don't die."
X-Git-Tag: 1.31.0-rc.0~21782^2
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=789e45bdc921fed430a5e28bba7e332f4b11d7e3;p=lhc%2Fweb%2Fwiklou.git

Revert "(Bug 41436) Tone down sanity check, just warn, don't die."

This reverts commit 770b6519bedcfdae9fe6debb22b349a61b84ab28

This seems to have introduced bug 41606.  By reverting, we get an exception rather than complete data loss.
---

diff --git a/includes/Revision.php b/includes/Revision.php
index afba498c28..431be69dc1 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -607,7 +607,7 @@ class Revision implements IDBAccessObject {
 					$this->mPage = $this->mTitle->getArticleID();
 				} elseif ( $this->mTitle->getArticleID() !== $this->mPage ) {
 					// got different page IDs, something is wrong.
-					wfWarn( "Page ID " . $this->mPage . " mismatches the ID "
+					throw new MWException( "Page ID " . $this->mPage . " mismatches the ID "
 							. $this->mTitle->getArticleID() . " provided by the Title object." );
 				}
 			}